bitkeeper revision 1.615 (3fbc9188pfX4YYzNRqNTu-qQSJS7XA)

aic79xx_osm.h, aic79xx_osm.c, aic79xx_host.h, aic79xx_core.c, Makefile:
  Add aic79xx SCSI support.

diff --git a/xen/drivers/scsi/aic7xxx/Makefile b/xen/drivers/scsi/aic7xxx/Makefile
index 333cea5f6a63a182be56cefc6b5a2daa5bde8cac..dd98ae8d377ed674d793543774aa7ad188193806 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/Makefile
+++ b/xen/drivers/scsi/aic7xxx/Makefile
@@ -35,9 +35,14 @@ obj-aic7xxx += aic7xxx_pci.o
 #obj-aic79xx = aic79xx_osm.o 
 #obj-aic79xx += aic79xx_proc.o
 #obj-aic79xx += aic79xx_osm_pci.o
+obj-aic7xxx += aic79xx_osm.o 
+obj-aic7xxx += aic79xx_proc.o
+obj-aic7xxx += aic79xx_osm_pci.o
 # Core Files
 #obj-aic79xx += aic79xx_core.o
 #obj-aic79xx += aic79xx_pci.o
+obj-aic7xxx += aic79xx_core.o
+obj-aic7xxx += aic79xx_pci.o
 
 default: aic7xxx.o
 

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_core.c b/xen/drivers/scsi/aic7xxx/aic79xx_core.c
index 660af5fe2414a241dad48fe9819dacb8888f14e8..92cf80df40258df261caff5fa95cffa359ffdd5c 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_core.c
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_core.c
@@ -6868,7 +6868,8 @@ ahd_calc_residual(struct ahd_softc *ahd, struct scb *scb)
        struct initiator_status *spkt;
        uint32_t sgptr;
        uint32_t resid_sgptr;
-       uint32_t resid;
+/* SAE */
+       uint32_t resid = 0;
 
        /*
         * 5 cases.

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_host.h b/xen/drivers/scsi/aic7xxx/aic79xx_host.h
index 5427eac459cbbca288cf29b7be683e0f219597ba..e8d1ce47a1f09a5fe804bba6d61609953857d3a0 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_host.h
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_host.h
@@ -62,11 +62,13 @@ int          ahd_linux_abort(Scsi_Cmnd *);
  * Scsi_Host_Template (see hosts.h) for AIC-79xx - some fields
  * to do with card config are filled in after the card is detected.
  */
+/* SAE:
+       proc_dir: NULL,                                         \
+       proc_info: ahd_linux_proc_info,                         \
+*/
 #define AIC79XX        {                                               \
        next: NULL,                                             \
        module: NULL,                                           \
-       proc_dir: NULL,                                         \
-       proc_info: ahd_linux_proc_info,                         \
        name: NULL,                                             \
        detect: ahd_linux_detect,                               \
        release: ahd_linux_release,                             \

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
index 9d3c4c14acbafc5b5444630cdad2521d455a9fd9..8aa7c01befb2b89df609fce8409ab7bc68bdf760 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -52,12 +52,12 @@
 #include "aic79xx_inline.h"
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
-#include <linux/init.h>                /* __setup */
+#include <xeno/init.h>         /* __setup */
 #endif
 
 #include "../sd.h"             /* For geometry detection */
 
-#include <linux/mm.h>          /* For fetching system memory size */
+#include <xeno/mm.h>           /* For fetching system memory size */
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
 /*
@@ -66,6 +66,8 @@
 spinlock_t ahd_list_spinlock;
 #endif
 
+/* SAE: */
+/*
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
 struct proc_dir_entry proc_scsi_aic79xx = {
        PROC_SCSI_AIC79XX, 7, "aic79xx",
@@ -73,6 +75,7 @@ struct proc_dir_entry proc_scsi_aic79xx = {
        0, 0, 0, NULL, NULL, NULL, NULL, NULL, NULL, NULL
 };
 #endif
+*/
 
 /*
  * Set this to the delay in seconds after SCSI bus reset.
@@ -83,7 +86,7 @@ struct proc_dir_entry proc_scsi_aic79xx = {
 #ifdef CONFIG_AIC79XX_RESET_DELAY_MS
 #define AIC79XX_RESET_DELAY CONFIG_AIC79XX_RESET_DELAY_MS
 #else
-#define AIC79XX_RESET_DELAY 5000
+#define AIC79XX_RESET_DELAY 500
 #endif
 
 /*
@@ -226,11 +229,13 @@ static uint16_t aic79xx_rd_strm_info[] =
 void
 ahd_print_path(struct ahd_softc *ahd, struct scb *scb)
 {
-       printk("(scsi%d:%c:%d:%d): ",
+/* SAE: */
+       printf("(scsi%d:%c:%d:%d): ",
               ahd->platform_data->host->host_no,
               scb != NULL ? SCB_GET_CHANNEL(ahd, scb) : 'X',
               scb != NULL ? SCB_GET_TARGET(ahd, scb) : -1,
               scb != NULL ? SCB_GET_LUN(scb) : -1);
+
 }
 
 /*
@@ -336,31 +341,30 @@ MODULE_DESCRIPTION("Adaptec Aic77XX/78XX SCSI Host Bus Adapter driver");
 MODULE_LICENSE("Dual BSD/GPL");
 #endif
 MODULE_PARM(aic79xx, "s");
-MODULE_PARM_DESC(aic79xx, "period delimited, options string.
-       verbose                 Enable verbose/diagnostic logging
-       debug                   Bitmask of debug values to enable
-       no_reset                Supress initial bus resets
-       extended                Enable extended geometry on all controllers
-       periodic_otag           Send an ordered tagged transaction periodically
-                               to prevent tag starvation.  This may be
-                               required by some older disk drives/RAID arrays. 
-       reverse_scan            Sort PCI devices highest Bus/Slot to lowest
-       tag_info:<tag_str>      Set per-target tag depth
-       rd_strm:<rd_strm_masks> Set per-target read streaming setting.
-       seltime:<int>           Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)
-
-       Sample /etc/modules.conf line:
-               Enable verbose logging
-               Set tag depth on Controller 2/Target 2 to 10 tags
-               Shorten the selection timeout to 128ms from its default of 256
-
-       options aic79xx='\"verbose.tag_info:{{}.{}.{..10}}.seltime:1\"'
-
-       Sample /etc/modules.conf line:
-               Change Read Streaming for Controller's 2 and 3
-
-       options aic79xx='\"rd_strm:{..0xFFF0.0xC0F0}\"'
-");
+MODULE_PARM_DESC(aic79xx, "period delimited, options string.\n"
+       "verbose                        Enable verbose/diagnostic logging\n"
+       "debug                  Bitmask of debug values to enable\n"
+       "no_reset               Supress initial bus resets\n"
+       "extended               Enable extended geometry on all controllers\n"
+       "periodic_otag          Send an ordered tagged transaction periodically\n"
+                               "to prevent tag starvation.  This may be\n"
+                               "required by some older disk drives/RAID arrays. \n"
+       "reverse_scan           Sort PCI devices highest Bus/Slot to lowest\n"
+       "tag_info:<tag_str>     Set per-target tag depth\n"
+       "rd_strm:<rd_strm_masks> Set per-target read streaming setting.\n"
+       "seltime:<int>          Selection Timeout(0/256ms,1/128ms,2/64ms,3/32ms)\n"
+"\n"
+       "Sample /etc/modules.conf line:\n"
+               "Enable verbose logging\n"
+               "Set tag depth on Controller 2/Target 2 to 10 tags\n"
+               "Shorten the selection timeout to 128ms from its default of 256\n"
+"\n"
+       "options aic79xx='\"verbose.tag_info:{{}.{}.{..10}}.seltime:1\"'\n"
+"\n"
+       "Sample /etc/modules.conf line:\n"
+               "Change Read Streaming for Controller's 2 and 3\n"
+"\n"
+       "options aic79xx='\"rd_strm:{..0xFFF0.0xC0F0}\"'\n");
 #endif
 
 static void ahd_linux_handle_scsi_status(struct ahd_softc *,
@@ -369,10 +373,12 @@ static void ahd_linux_handle_scsi_status(struct ahd_softc *,
 static void ahd_linux_filter_command(struct ahd_softc*, Scsi_Cmnd*,
                                     struct scb*);
 static void ahd_linux_dev_timed_unfreeze(u_long arg);
-#if NO_YET
+/* SAE */
+#if XENO_KILLED
 static void ahd_linux_sem_timeout(u_long arg);
+#endif
 static int  ahd_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag);
-#endif 
+
 static void ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd);
 static void ahd_linux_select_queue_depth(struct Scsi_Host *host,
                                         Scsi_Device *scsi_devs);
@@ -395,6 +401,8 @@ static void ahd_linux_setup_tag_info(char *p, char *end);
 static void ahd_linux_setup_rd_strm_info(char *p, char *end);
 static int ahd_linux_next_unit(void);
 static void ahd_runq_tasklet(unsigned long data);
+/* SAE: .... */
+struct notifier_block;
 static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf);
 
 static __inline struct ahd_linux_device*
@@ -640,12 +648,14 @@ ahd_runq_tasklet(unsigned long data)
 }
 
 /************************ Shutdown/halt/reboot hook ***************************/
-#include <linux/notifier.h>
-#include <linux/reboot.h>
-
+#include <xeno/notifier.h>
+#include <xeno/reboot.h>
+/* SAE: */
+/*
 static struct notifier_block ahd_linux_notifier = {
        ahd_linux_halt, NULL, 0
 };
+*/
 
 static int ahd_linux_halt(struct notifier_block *nb, u_long event, void *buf)
 {
@@ -1184,11 +1194,14 @@ ahd_linux_register_host(struct ahd_softc *ahd, Scsi_Host_Template *template)
 
 uint64_t
 ahd_linux_get_memsize()
-{
+{/*
        struct sysinfo si;
 
        si_meminfo(&si);
        return (si.totalram << PAGE_SHIFT);
+*/
+       printf("SAE: aic79xx_osm: get_memsize\n");
+       return 0;
 }
 
 /*
@@ -1264,6 +1277,7 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
        }
        /* Give the bus some time to recover */
        if ((ahd->flags & AHD_RESET_BUS_A) != 0) {
+/* SAE: No timers
                ahd_freeze_simq(ahd);
                init_timer(&ahd->platform_data->reset_timer);
                ahd->platform_data->reset_timer.data = (u_long)ahd;
@@ -1272,6 +1286,8 @@ ahd_linux_initialize_scsi_bus(struct ahd_softc *ahd)
                ahd->platform_data->reset_timer.function =
                    (ahd_linux_callback_t *)ahd_release_simq;
                add_timer(&ahd->platform_data->reset_timer);
+*/
+               mdelay(AIC79XX_RESET_DELAY);
        }
 }
 
@@ -1289,19 +1305,24 @@ ahd_platform_alloc(struct ahd_softc *ahd, void *platform_arg)
        ahd->platform_data->hw_dma_mask = 0xFFFFFFFF;
        ahd_lockinit(ahd);
        ahd_done_lockinit(ahd);
+/* SAE */
+#if XENO_KILLED
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)
        init_MUTEX_LOCKED(&ahd->platform_data->eh_sem);
 #else
        ahd->platform_data->eh_sem = MUTEX_LOCKED;
 #endif
+#endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        tasklet_init(&ahd->platform_data->runq_tasklet, ahd_runq_tasklet,
                     (unsigned long)ahd);
 #endif
        ahd->seltime = (aic79xx_seltime & 0x3) << 4;
-       
+/* SAE */
+#if XENO_KILLED
        if (TAILQ_EMPTY(&ahd_tailq))
                register_reboot_notifier(&ahd_linux_notifier);
+#endif
        return (0);
 }
 
@@ -1342,7 +1363,9 @@ ahd_platform_free(struct ahd_softc *ahd)
                free(ahd->platform_data, M_DEVBUF);
        }
        if (TAILQ_EMPTY(&ahd_tailq)) {
+/* SAE:
                unregister_reboot_notifier(&ahd_linux_notifier);
+*/
 #ifdef CONFIG_PCI
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
                pci_unregister_driver(&aic79xx_pci_driver);
@@ -2082,7 +2105,10 @@ ahd_done(struct ahd_softc *ahd, struct scb * scb)
 
        if ((scb->flags & SCB_RECOVERY_SCB) != 0) {
                printf("Recovery SCB completes\n");
+/* SAE: */
+#if XENO_KILLED
                up(&ahd->platform_data->eh_sem);
+#endif
        }
 
        ahd_free_scb(ahd, scb);
@@ -2422,7 +2448,8 @@ ahd_release_simq(struct ahd_softc *ahd)
        }
 }
 
-#if NOT_YET
+/* SAE */
+#if XENO_KILLED
 static void
 ahd_linux_sem_timeout(u_long arg)
 {
@@ -2431,6 +2458,7 @@ ahd_linux_sem_timeout(u_long arg)
        sem = (struct semaphore *)arg;
        up(sem);
 }
+#endif
 
 static int
 ahd_linux_queue_recovery_cmd(Scsi_Cmnd *cmd, scb_flag flag)
@@ -2672,6 +2700,10 @@ done:
        if (paused)
                ahd_unpause(ahd);
        if (wait) {
+/* SAE */
+               printf("SAE: aic79xxx: recovery failed\n");
+               retval=FAILED;
+#if XENO_KILLED
                struct timer_list timer;
                int ret;
 
@@ -2690,6 +2722,7 @@ done:
                        retval = FAILED;
                }
                ahd_lock(ahd, &s);
+#endif
        }
        acmd = TAILQ_FIRST(&ahd->platform_data->completeq);
        TAILQ_INIT(&ahd->platform_data->completeq);
@@ -2700,7 +2733,6 @@ done:
        spin_lock_irq(&io_request_lock);
        return (retval);
 }
-#endif
 
 static void
 ahd_linux_dev_timed_unfreeze(u_long arg)
@@ -2823,12 +2855,20 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
        int     heads;
        int     sectors;
        int     cylinders;
+/* SAE */
+#if XENO_KILLED
        int     ret;
+#endif
        int     extended;
        struct  ahd_softc *ahd;
+/* SAE */
+#if XENO_KILLED
        struct  buffer_head *bh;
+#endif
 
        ahd = *((struct ahd_softc **)disk->device->host->hostdata);
+/* SAE: */
+#if XENO_KILLED
        bh = bread(MKDEV(MAJOR(dev), MINOR(dev) & ~0xf), 0, 1024);
 
        if (bh) {
@@ -2838,6 +2878,7 @@ ahd_linux_biosparam(Disk *disk, kdev_t dev, int geom[])
                if (ret != -1)
                        return (ret);
        }
+#endif
        heads = 64;
        sectors = 32;
        cylinders = disk->capacity / (heads * sectors);
@@ -2923,5 +2964,5 @@ ahd_platform_dump_card_state(struct ahd_softc *ahd)
 #if defined(MODULE) || LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
 static Scsi_Host_Template driver_template = AIC79XX;
 Scsi_Host_Template *aic79xx_driver_template = &driver_template;
-#include "../scsi_module.c"
+#include "../scsi_module.c.inc"
 #endif

diff --git a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h
index 1c81a586c323fd52bc1fc7468a2afc4fa667fef5..b7686f19938546a44ecfade4e405704e9ff162f7 100644 (file)
--- a/xen/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/xen/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -42,29 +42,35 @@
 #ifndef _AIC79XX_LINUX_H_
 #define _AIC79XX_LINUX_H_
 
-#include <linux/types.h>
-#include <linux/blk.h>
-#include <linux/blkdev.h>
-#include <linux/delay.h>
-#include <linux/ioport.h>
-#include <linux/pci.h>
-#include <linux/version.h>
+#include <xeno/types.h>
+#include <xeno/blk.h>
+#include <xeno/blkdev.h>
+#include <xeno/delay.h>
+#include <xeno/ioport.h>
+#include <xeno/pci.h>
+/* SAE */
+#if XENO_KILLED
+#include <xeno/version.h>
+#endif
 #ifndef AHD_MODVERSION_FILE
 #define __NO_VERSION__
 #endif
-#include <linux/module.h>
+#include <xeno/module.h>
 #include <asm/byteorder.h>
 
 #ifndef KERNEL_VERSION
 #define KERNEL_VERSION(x,y,z) (((x)<<16)+((y)<<8)+(z))
 #endif
 
+/* SAE */
+#define LINUX_VERSION_CODE KERNEL_VERSION(2,4,0)
+
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
-#include <linux/interrupt.h> /* For tasklet support. */
-#include <linux/config.h>
-#include <linux/slab.h>
+#include <xeno/interrupt.h> /* For tasklet support. */
+#include <xeno/config.h>
+#include <xeno/slab.h>
 #else
-#include <linux/malloc.h>
+#include <xeno/malloc.h>
 #endif
 
 /* Core SCSI definitions */
@@ -134,17 +140,23 @@ typedef Scsi_Cmnd      *ahd_io_ctx_t;
 #endif
 #endif /* BYTE_ORDER */
 
+/* SAE: */
+#define off_t int
+
 /************************* Configuration Data *********************************/
 extern int aic79xx_detect_complete;
 extern Scsi_Host_Template* aic79xx_driver_template;
 
 /***************************** Bus Space/DMA **********************************/
-
+/* SAE */
+typedef dma_addr_t bus_addr_t;
+#if XENO_KILLED
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2,2,17)
 typedef dma_addr_t bus_addr_t;
 #else
 typedef uint32_t bus_addr_t;
 #endif
+#endif
 typedef uint32_t bus_size_t;
 
 typedef enum {
@@ -426,11 +438,15 @@ ahd_timer_reset(ahd_timer_t *timer, int usec, ahd_callback_t *func, void *arg)
 }
 
 /***************************** SMP support ************************************/
+/* SAE */
+#include <xeno/spinlock.h>
+/*
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,17)
-#include <linux/spinlock.h>
+#include <xeno/spinlock.h>
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,93)
-#include <linux/smp.h>
+#include <xeno/smp.h>
 #endif
+*/
 
 #define AIC79XX_DRIVER_VERSION  "1.0.0"
 
@@ -591,9 +607,13 @@ struct scb_platform_data {
        struct ahd_linux_device *dev;
        bus_addr_t               buf_busaddr;
        uint32_t                 xfer_len;
+/* SAE */
+       uint32_t                 resid;         /* Transfer residual */
+#if XENO_KILLED
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)
        uint32_t                 resid;         /* Transfer residual */
 #endif
+#endif
 };
 
 /*
@@ -610,16 +630,23 @@ struct ahd_platform_data {
        struct ahd_linux_target *targets[AHD_NUM_TARGETS]; 
        TAILQ_HEAD(, ahd_linux_device) device_runq;
        struct ahd_completeq     completeq;
-
+/* SAE */
+       spinlock_t               spin_lock;
+       struct tasklet_struct    runq_tasklet;
+#if XENO_KILLED
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,1,0)
        spinlock_t               spin_lock;
 #endif
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0)
        struct tasklet_struct    runq_tasklet;
+#endif
 #endif
        u_int                    qfrozen;
        struct timer_list        reset_timer;
+/* SAE: No semaphores */
+#if XENO_KILLED
        struct semaphore         eh_sem;
+#endif
        struct Scsi_Host        *host;          /* pointer to scsi host */
 #define AHD_LINUX_NOIRQ        ((uint32_t)~0)
        uint32_t                 irq;           /* IRQ for this adapter */
@@ -988,7 +1015,7 @@ void ahd_power_state_change(struct ahd_softc *ahd,
 #if defined(__sparc_v9__) || defined(__powerpc__)
 #error "PPC and Sparc platforms are only support under 2.1.92 and above"
 #endif
-#include <linux/bios32.h>
+#include <xeno/bios32.h>
 #endif
 
 int                     ahd_linux_pci_probe(Scsi_Host_Template *);